From 416bda12047586a847f554615c2df53804f43c20 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Tue, 27 May 2008 00:08:00 +0000 Subject: [PATCH] Set password dialog modal and transient for the parent window also if it 2008-05-27 Carlos Garnacho * gtk/gtkmountoperation.c (gtk_mount_operation_ask_password): Set password dialog modal and transient for the parent window also if it was specified in the constructor. Bug #531864. svn path=/trunk/; revision=20182 --- ChangeLog | 6 ++++++ gtk/gtkmountoperation.c | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8df23b979e..daf74c9d63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-05-27 Carlos Garnacho + + * gtk/gtkmountoperation.c (gtk_mount_operation_ask_password): Set + password dialog modal and transient for the parent window also if it + was specified in the constructor. Bug #531864. + 2008-05-26 Richard Hult * gdk/quartz/gdkevents-quartz.c: (gdk_screen_get_setting): Try diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c index 38fe03c391..ebd6cbf031 100644 --- a/gtk/gtkmountoperation.c +++ b/gtk/gtkmountoperation.c @@ -621,7 +621,12 @@ gtk_mount_operation_ask_password (GMountOperation *mount_op, g_object_notify (G_OBJECT (operation), "is-showing"); - if (priv->parent_window == NULL && priv->screen) + if (priv->parent_window) + { + gtk_window_set_transient_for (window, priv->parent_window); + gtk_window_set_modal (window, TRUE); + } + else if (priv->screen) gtk_window_set_screen (GTK_WINDOW (dialog), priv->screen); gtk_widget_show_all (GTK_WIDGET (dialog)); -- 2.30.2